Conversation
|
Your PR requires formatting changes to meet the project's style guidelines. Click here to view the suggested changes.diff --git a/src/jlgen.jl b/src/jlgen.jl
index db3ab6e..0a97877 100644
--- a/src/jlgen.jl
+++ b/src/jlgen.jl
@@ -426,7 +426,7 @@ function GPUInterpreter(world::UInt=Base.get_world_counter();
opt_params::CC.OptimizationParams)
@assert world <= Base.get_world_counter()
- inf_cache = INFERENCE_CACHE_TYPE()
+ inf_cache = INFERENCE_CACHE_TYPE()
return GPUInterpreter(world, method_table_view,
token, inf_cache,
@@ -437,7 +437,7 @@ function GPUInterpreter(interp::GPUInterpreter;
world::UInt=interp.world,
method_table_view::CC.MethodTableView=interp.method_table_view,
token::Any=interp.token,
- inf_cache::INFERENCE_CACHE_TYPE=interp.inf_cache,
+ inf_cache::INFERENCE_CACHE_TYPE = interp.inf_cache,
inf_params::CC.InferenceParams=interp.inf_params,
opt_params::CC.OptimizationParams=interp.opt_params)
return GPUInterpreter(world, method_table_view,
diff --git a/src/reflection.jl b/src/reflection.jl
index ffffa8e..386327b 100644
--- a/src/reflection.jl
+++ b/src/reflection.jl
@@ -167,10 +167,10 @@ InteractiveUtils.code_warntype(err::KernelError; kwargs...) = code_warntype(err.
struct jl_llvmf_dump
TSM::LLVM.API.LLVMOrcThreadSafeModuleRef
F::LLVM.API.LLVMValueRef
-@static if VERSION >= v"1.14.0-DEV.1823" # JuliaLang/julia#60698
- dump::Ptr{Nothing}
- jl_llvmf_dump(TSM::LLVM.API.LLVMOrcThreadSafeModuleRef, F::LLVM.API.LLVMValueRef) = new(TSM, F, C_NULL)
-end
+ @static if VERSION >= v"1.14.0-DEV.1823" # JuliaLang/julia#60698
+ dump::Ptr{Nothing}
+ jl_llvmf_dump(TSM::LLVM.API.LLVMOrcThreadSafeModuleRef, F::LLVM.API.LLVMValueRef) = new(TSM, F, C_NULL)
+ end
end
"""
diff --git a/test/native.jl b/test/native.jl
index 4289c45..951dc17 100644
--- a/test/native.jl
+++ b/test/native.jl
@@ -304,7 +304,7 @@ end
# breaking recursion in print_to_string makes it possible to compile
# even in the presence of the above bug
- # Native.code_llvm(devnull, Base.print_to_string, Tuple{Int,Int}; optimize=false)
+ # Native.code_llvm(devnull, Base.print_to_string, Tuple{Int,Int}; optimize=false)
@test "We did not crash!" != ""
end
diff --git a/test/native/precompile.jl b/test/native/precompile.jl
index a7f9b95..c2eaffc 100644
--- a/test/native/precompile.jl
+++ b/test/native/precompile.jl
@@ -76,7 +76,7 @@ precompile_test_harness("Inference caching") do load_path
@test check_presence(square_mi, token)
# check that identity survived
- @test check_presence(identity_mi, token) broken=(v"1.12.0-DEV.1268" <= VERSION < v"1.12.5" || v"1.13.0-" <= VERSION < v"1.13.0-rc1" || v"1.14.0-" <= VERSION < v"1.14.0-DEV.1843")
+ @test check_presence(identity_mi, token) broken = (v"1.12.0-DEV.1268" <= VERSION < v"1.12.5" || v"1.13.0-" <= VERSION < v"1.13.0-rc1" || v"1.14.0-" <= VERSION < v"1.14.0-DEV.1843")
GPUCompiler.clear_disk_cache!()
@test GPUCompiler.disk_cache_enabled() == false
diff --git a/test/ptx/precompile.jl b/test/ptx/precompile.jl
index fb6910f..e670c78 100644
--- a/test/ptx/precompile.jl
+++ b/test/ptx/precompile.jl
@@ -49,6 +49,6 @@ precompile_test_harness("Inference caching") do load_path
@test check_presence(kernel_mi, token)
# check that identity survived
- @test check_presence(identity_mi, token) broken=(v"1.12.0-DEV.1268" <= VERSION < v"1.12.5" || v"1.13.0-" <= VERSION < v"1.13.0-rc1" || v"1.14.0-" <= VERSION < v"1.14.0-DEV.1843")
+ @test check_presence(identity_mi, token) broken = (v"1.12.0-DEV.1268" <= VERSION < v"1.12.5" || v"1.13.0-" <= VERSION < v"1.13.0-rc1" || v"1.14.0-" <= VERSION < v"1.14.0-DEV.1843")
end
end |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #771 +/- ##
==========================================
+ Coverage 75.28% 75.93% +0.64%
==========================================
Files 24 24
Lines 3856 3831 -25
==========================================
+ Hits 2903 2909 +6
+ Misses 953 922 -31 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
test/native.jl
Outdated
| # breaking recursion in print_to_string makes it possible to compile | ||
| # even in the presence of the above bug | ||
| Native.code_llvm(devnull, Base.print_to_string, Tuple{Int,Int}; optimize=false) | ||
| # Native.code_llvm(devnull, Base.print_to_string, Tuple{Int,Int}; optimize=false) |
There was a problem hiding this comment.
It's a temporary commit I pushed to confirm that it was the source of the hang in the native testset on nightly. Any idea what could be causing the hang?
There was a problem hiding this comment.
The recursion triggering recursion during codegen? There's been inference cache changes, after all.
There was a problem hiding this comment.
This failure went away because as of #773, optimize=false is properly propagated through Native.code_llvm, but the test still hangs when optimize=true on nightly. Is that expected?
There was a problem hiding this comment.
Ah damn, I had hoped this was fixed on the Julia side. No, hangs with optimize=true are not expected, but breakage on master happens often. Did you have something that reproduced locally? If so just file an issue for now.
8967862 to
1e03991
Compare
No description provided.